Merge "Mark as recovery_available: true" am: 6620977562
am: 1f4c6236c5

Change-Id: I60507acfe343afe7ef24332fbcc6bbd1bfae7659