Merge "Update code to match FeatureFlagUtils interface change."