Merge changes from topic "trm-demux-des" into rvc-dev am: 700c955ffd am: ead5dddadc am: c6a9e9e60a

Change-Id: I8682605a871a71f008af4bec11c8a1cd05d9297f