Merge "Extend FeatureFlagUtils to take a context object."