Merge "Do cleanup before/after running the test" into rvc-dev am: dac57a3e53

Change-Id: Iaa3daeed9d6a77110ffabaacbead438bfedb9c82