Merge "Add setting and logging for RTT" am: b823d08d21
am: 1c2da9f909

Change-Id: Ic5ab105e5b2c3ad3866bee4d7dd5a6d8427adc74