Merge "Mark as recovery_available:true" am: 2ff015d2f5
am: aa016771fd

Change-Id: I1592d0a56546857eb1963db8e71f932e25114bf5