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

Change-Id: Ia75e8d9f46a45cebe85fead54a85d8b7641229cd