Merge "Allow mediaserver to find "audio" service"