DO NOT MERGE - Unify the recovery UI.

Bug: 147311531
Test: build
Change-Id: I7e71f95d455abaab0b6d4e770978e6332bae5372
3 files changed