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