Merge "Add the CorePerfTests and MultiUserPerfTests to APCT metrics" into pi-dev