Merge "Make FeatureFlagManager Dumpable"