Merge "Add feature flag to FeatureFlagUtils." into udc-qpr-dev