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

Change-Id: I0207ee73eee69096dc83d89553d21d462886b788