Merge "Reduce test warmup time to avoid driving into thermal throttle." into jb-mr1-dev