Merge "Simplify method management for IAudioService"