Misc audio changes

Change-Id: Iecc65ff9d07db23ed336725ca9cd5451ca6e9c05