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

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