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

Change-Id: If6553179b8176ceb9e2ab97799b2bd8a3216f176