Merge "Add a stub recovery UI." am: 8c1584feaf am: 2f8f6ec0fc
am: ef45a88680

Change-Id: I22e054d7fa4ca9986d6b9b3e625a2cbd8449aaa1