Audio fix (EXP)

Change-Id: I7e227a24d3759c09dfa7c15f2c97ff57c3c06062
Audio fix (EXP) [2/2]

Change-Id: Icd874b3c8a065f61fb813f5628f6fe444d9459ec