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

Change-Id: I1aeaba276dd000b61cc7312af284b1170d32942f