Merge "RTT bugfixes, part 5" am: 76e665ba05 am: b2b4ee3ea2
am: 3a2bbd935d  -s ours

Change-Id: I9252669a3dddc95690793b4145f6552815030e07