Merge changes from topic "soundtrigger-vts-tech-debt" into rvc-dev am: 8438a18c57 am: 7278d84d48

Change-Id: I28d6ce08d01222a29713b7bf3c6f60aa46f06524