DO NOT MERGE - Unify the recovery UI.

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