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

Change-Id: I70124176e121858cbe19f79fc351d8c386535b4c