Merge "Make FeatureFactoryImpl non-final so it can have subclass."