Add remove flags for service update Upstream-commit: 83f232e18670af884d84d10690e0c11c0e2f22b8 Component: engine