am 0e784cb3: am 0c622570: Merge "Reduce test warmup time to avoid driving into...
am 0e784cb3: am 0c622570: Merge "Reduce test warmup time to avoid driving into thermal throttle." into jb-mr1-dev
* commit '0e784cb3':
Reduce test warmup time to avoid driving into thermal throttle.