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

* commit '3542f3dafae3d9bed5fecb09281726d09d4b13f9':