Fix flaky test by hacking bad cleanup code.
Fix flaky test by hacking bad cleanup code.

Proper fix forthcoming with other Om-state cleanup.

prathamesh-sonpatki/frontend,circleci/frontend,circleci/frontend,prathamesh-sonpatki/frontend,RayRutjes/frontend,RayRutjes/frontend,circleci/frontend