Merge "Mark as recovery_available:true"
am: ca8f3be17d

Change-Id: I8aea06840de00f1c2d7873f15a0f2f881f8b2d6f