Merge "LoggingPrintStream: Make visible for testing" am: 7d1789867b am: dcb8cf8732 am: 0db4c361e3
am: 245ecc9a95

Change-Id: I933617b2bf177c82b69a4908ddeb65074186b52f