Merge "Refactored FactoryResetter to use a Builder."