Follow our own audio-bfam

Change-Id: I75ebf28bbb9ff6607c37e2a87c4e7679faa60bee