Merge changes from topic "enable-rtt-emer" into rvc-dev am: 78ca8ffdc6 am: 913f16aebd am: 8a7df9980a am: b88e27244d

Change-Id: I0a153711fa532e666b053fb056e445d7981136fe