Merge "RTT logging tweaks"
am: a4dcaa7346

Change-Id: Ibb0c3ef11ce282ecd7930a50bc9f158bc5d0f45c