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

* commit 'a6e040f85dc76ff3c64d154dad82d8620a4af1d2':
  Switch to latest version of Caliper