am a162a86a: Merge "Fix the build when logging is enabled."

* commit 'a162a86accfb8213da7a67e86c15fcf6d1df21e1':
  Fix the build when logging is enabled.