Merge "Do cleanup before/after running the test" into rvc-dev am: dac57a3e am: ceb0486b am: 797c787b Change-Id: Ib8e7705ca594eea1ba902e432200dba89a875c0e