Merge "Fix inconsistency in LoggingPrintStream."