Merge "Mark as recovery_available: true"
am: 9f6f8bf0dc

Change-Id: I6f45b13fcfe21c55ba5e513383bd69b9a1fc185c