am 3e3364e2: Merge "Tidy logging code not using UNIMPLEMENTED."

* commit '3e3364e267117462894e0c3b7d9b413b25d28057':
  Tidy logging code not using UNIMPLEMENTED.