Help the cherry-pick for the unit test regression caused by coverity changes.