Merge "Modify PackageManagerPerfTest to work by itself agian" into rvc-dev