am 6b802c4b: (-s ours) am 102ead3a: am b10e562b: Merge "Introduce a mechanism to trace boot sequence."

* commit '6b802c4b9565c83a863c88416e6b7e5c3d418aeb':