Merge "Remove hidden api dependency of FeatureFlagUtils"