Merge "RTT bugfixes, part 5" am: 76e665ba05
am: b2b4ee3ea2

Change-Id: Ibb67cff0a636204a98074addb62126c42b59bebb