Merge \\"Fix early init logging.\\" am: 6d232ab4de
am: 1cbd1f5016

Change-Id: I33854b5ac99f09f215504a1d94dfdb42fa405512