Audio Update: After recent audio changes, FIX issues which arose.

Change-Id: I4f4d9809e9cabd8dc671c551d3404f19ee809ff0