Merge "Mark as recovery_available: true" am: 39a42b66aa
am: 8923484810

Change-Id: I99b63f3242c754f3b68cb6d4f41b2356c6bfc655