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

Change-Id: I8742890e5fbb43aa6d8d70c47ba856cae4ed0c84