Merge "Keep FakeFeatureFlagsImpl" into main