Merge \\\\"Remove no-op klog_init.\\\\" am: 5558cd362b am: 8932be864d am: 30fc292a26
am: f58dc88f56

Change-Id: I67e7f65ce6e3106bfa38f60b862d202c669d27a6