Merge "RTT bugfixes, part 5"
am: de3eeac84d

Change-Id: I2e8db964b551f7ab1cc7c286b8fedc553f1e1b8f