Merge "Mark as recovery_available:true"
am: 2ff015d2f5

Change-Id: I0e8470727b08bc482af09c312863b91906423303