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

Change-Id: I7f629f14a4b965a760de1647f9ad16423e700442