Merge "Remove newline from "capturing trace..."" into oc-dev
am: 871795f9e4

Change-Id: I4f97e3f42c35340505a8d7366cb28267428c2c41