Merge changes from topic 'audio-primary-hal-vts-fix' into oc-dev am: 257c2f1a43
am: c8e1b1dadc

Change-Id: Ifb57505618923484ea469dcbf117f90d2cdd1f4b