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

Change-Id: Ife707144b42ba025c111015f7a01a06a5c9cd492