am 328cb8cb: am 025c0e79: Merge "Clean up LOG functions."

* commit '328cb8cb5a434ba9d897443a408d11e8ee8c64a0':
  Clean up LOG functions.