Merge "Remove non-flag specific code from FeatureFlags."