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

Change-Id: I5443e7d3254beebd5db176376e1654a25967ccf8