Replace with featureFactory. Bug: 286764889 Test: m Settings Change-Id: I30bd2e9b25e1681d7694939dd8ec84fcd6fd7c08