Merge "RTT bugfixes, part 5" am: de3eeac84d
am: 69b0d8bc97

Change-Id: I766c0dab4e6b234f14d46193a84b1b970bb8473a