Merge "TextOutput log improvement"
am: 3e9e757437

Change-Id: I88fec0002898ec7da19d579d0aa4679b73bfcd53