Merge "AudioManager: address API review comments" into sc-dev