Merge "RTT initialization bug fixes" am: bbaa6b7de7 am: b267431fe2
am: ea39d43b76  -s ours

Change-Id: I5ebde392f7ec7723f2b80dc86c9138d24e84a00d