Merge "Follow-up to Switch to the latest version of Caliper"
am: 80d5bef6f9

* commit '80d5bef6f9da4a0eeb23c3356843351170553df6':
  Follow-up to Switch to the latest version of Caliper