Merge changes from topic 'vts-audio-fix' into oc-dev
am: d7e88525a7

Change-Id: I2e07e075b294ab499703d51f2ef9bb5aa4319ecc