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