Merge "Mark as recovery_available: true"
am: 6620977562

Change-Id: I9061e3ad757e9a7c4bf6a5510e760553fe246aa4