Merge "Mark as recovery_available:true" am: ca8f3be17d
am: dad458d52c

Change-Id: I73e7943b796e6918655f37b39016acef7be07fc1