am ca2cd25b: (-s ours) am daeb1d90: am c547a4d5: Please do not merge (already submitted downstream); check entire recovery partition on startup

* commit 'ca2cd25b3542749e491b1c00aeca5d3f59c99ad9':
  Please do not merge (already submitted downstream); check entire recovery partition on startup