Merge "TextOutput log improvement" am: 3e9e757437
am: 1ccb872a9e

Change-Id: Ic9efec9193ed37c7bbfca966c07224b9e96349fb