Merge "recovery_ui: Remove RecoveryUI::last_key." am: 04b4ff695d
am: 4324e07a29

Change-Id: Ia14ad137f562e59cfd22c5665598e1dbef1b8a87