Merge "fix missing FLAG in audio_context_flag" into nyc-dev