Test: AppButtonsTest, AppRestoreButtonTest Bug: 304255818 Change-Id: Ica9055d8ee5603e4bb682e9b5d90a225c839002a