Fix cleaning up while running the tests

 * Looks like this was introduced in change,
   I295cb3a0b112e6d6c512c845cc17e3118f477c50

Bug: 71341
Change-Id: I91ce465112665c858f4acf8f1c35d1b5857bfc9f
Merge "Fix cleaning up while running the tests"