Merge "Cleanup remote execution of perf tests." into ics-mr1