Merge "Add IntentTest whitelist DynamicConfig" into oc-dev