Merge "Use Seconds as time unit for all performance tests"