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

* commit '5d2fadb1492c1a2dd5437fcfb4afde2b2c3df4bd':