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

Change-Id: Idf3a130dad9b024aa094a50e09cf497ace5cdbd5