Fixes Carriage Return when testing connected dev am: 501e6b7cbe
am: 21a96408c5

Change-Id: I26f44c67132f77a534db37a9ce97b721af1ecb7b