Merge "Merge "Add setting and logging for RTT" am: b823d08d21 am: 1c2da9f909 am: 1b7261996e  -s ours"