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

* commit '025c0e79c3e05babd4df0bab8249466b489c0870':
  Clean up LOG functions.