Merge \\\\"Remove call to no-op klog_init.\\\\" am: 2b66a6f2bd am: c127f96fb1 am: a3d716067b
am: f9dec28e3a

Change-Id: Ic32b8c9b91012a4f43b5e0d81c7f78a0428c168f