Fixes Carriage Return when testing connected dev
am: 501e6b7cbe

Change-Id: I63c94081405e2eb77b04498578eac8b5afd91595