Merge "Switch to latest version of Caliper"
am: 328be29904

* commit '328be29904d1ae42eda97f7c045c8bfa8c54e5ec':
  Switch to latest version of Caliper