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

* commit '529a793c69f7ab133a29da8e50e67e8e47f2175f':