audio adjustment

Change-Id: I22b2d2f2c429f6263130b55620b863388dbce1a8
Enrc2b fix merge error and massive derp

Change-Id: I37bcc0a877652a599989189284e2b769b6e9a0e7