RTT initialization bugfixes am: fb8d5abd22 am: bb39d8595f
am: e015900f11  -s ours

Change-Id: I1cde97952ea868c5a684dea16a991763cf7a4f7c