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

Change-Id: I9887499577abfb9d2dfc57909ec3f23cc764384d