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

Change-Id: I6fe353474cac61836d0308ccf99a4870b28766e1