Merge "Trim output before testing" into oc-dev
am: d3caca2e25

Change-Id: I0317fe791f2a385ffd97366fed98d57e2cb3249c