Merge "RTT initialization bug fixes" am: bbaa6b7de7
am: b267431fe2

Change-Id: Iac3b2e256b27968471cd8e161f9c392b02d70a93