am ca9ba160: am bea98dc2: Merge "Fix inconsistency in LoggingPrintStream."

* commit 'ca9ba160ae8d0b00919298845aceba8b9dc514d0':
  Fix inconsistency in LoggingPrintStream.