am b8893c04: am d4662983: Fix restore from keyboard automerge: e551539
* commit 'b8893c044df4e3cdcb8aeafe7ab4fc8b3a626049': Fix restore from keyboardmain
commit
b050b458dc
e551539
* commit 'b8893c044df4e3cdcb8aeafe7ab4fc8b3a626049': Fix restore from keyboardmain