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

Change-Id: I3d5ddb90e092a8cd0dfe280965ab01221951cbec