Optimize for best audio output

Change-Id: I37f0177fcc095d8398d6007b3183e44d0788710d