Merge changes from topic "enable-rtt-emer" into rvc-dev am: 78ca8ffdc6

Change-Id: Idb15d13c36ee55bd602f14a151f3c0bb1542cece