Changes required to pass UpdaterTaskTTest.FindAndRemoveTest