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

* commit 'b6faf00b9b32dcc0a4d36a2addb7e3d6fedf35db':

Change-Id: I459448944a775e8bb313aa31fe61bc61213b847d