Merge "feature flag: Policy feature enabled config group"