Merge "Remove unnecessary cleanup procedures of WmTests" into rvc-dev