Merge "Move audio config props to audio_config_prop"