Merge "audio_utils code cleanup"