am 33350528: am 81787e56: Merge "Was calculating measured warmup time wrong" into jb-dev

* commit '333505280fd86cf91bd97096bfa5a3fb524d84c1':
  Was calculating measured warmup time wrong