Merge "Device owns the RecoveryUI instance." am: 6df846e337 am: 8d593973d6
am: 4fd58ca28a

Change-Id: I0373e17e90f88c6817d938c4bab3ea475fa9434f