Merge "Move away from deprecated FakeFeatureFactory.setupForTest()"