Merge "Mark as recovery_available:true"
am: fcd3f7abe1

Change-Id: Icb496368af2cc0dc15e2646ece737013a392b78c