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

Change-Id: I5fd576a1e9c05c035d8618091a72f9c5a5f90333