Allow merge/ replace of local feature flags GitOrigin-RevId: 531c2b9e73da8b8ca90ec0ed334a21c584cebe59