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

Change-Id: I67bd7eb7b3a6cfd797fdfe12ee1b36d113831cac