Apply my audio finesse

Change-Id: I5c7a62eaa693d562f2169af8bea7ffc4a5a8ac3a