Merge "Add FakeFeatureFactory.setupForTest"