Merge "Update recovery UI." into nyc-dev am: 2f1eedd
am: 21092a9

* commit '21092a98235d98f431c88ac5f4369ab1ccf0ae9f':

Change-Id: I045e0c51a42c6026c9dfe7c7bb4ddc20479ccd8f