Merge "RTT bugfixes, part 5" am: de3eeac84d am: 69b0d8bc97
am: 786012b229  -s ours

Change-Id: Ifb2e1384a935046b3272d05b2707a63b5e75b734