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

Change-Id: I882fa14b30caea2fc75633a0f209795278db4c95