Merge "Was calculating measured warmup time wrong" into jb-dev