Merge "Mark as recovery_available:true" am: ddf2947359 am: 6d81f8732c
am: 63f4683ba7

Change-Id: I41a553d596e53b8673d44fac83ba04ee8b6e2aaf