RTT initialization bugfixes
am: fb8d5abd22

Change-Id: I1a06627a2ba828e9790dfcbd8f979f237fd58bec