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

Change-Id: I9b40b1856a1fb07d9c6da17dbf7099cc15750e8e