Merge "AudioService: more communication mode fix"