Merge "Do cleanup before/after running the test" into rvc-dev am: dac57a3e53 am: ceb0486b32
am: d4acb53152
Change-Id: Iec7355987a25181918e0d786be7e1c7e0b02dd81
This commit is contained in: