Merge "Mark as recovery_available:true" am: fcd3f7abe1
am: 371addba41

Change-Id: I8e3a76a71672ebeb3aefe25cb6e725d4d4dd7fef