am 0381c926: am 3542f3da: (-s ours) am 7b0bb824: am 93adb524: Merge "init: Fix logging stutter"

* commit '0381c9264e1fce0061ff572874ef071179ac3b64':