Merge "RTT initialization bug fixes"
am: bbaa6b7de7

Change-Id: I2ae58e3606d5a71039646ceac15beb182729329d