Merge changes from topic "enable-rtt-emer" am: f2329bcfef

Change-Id: Ice45cc192dd9689af8c593d09bf834b6695cf3f8