Merge "Switch to the latest version of Caliper" am: ae119af517
am: 5e2d958157

* commit '5e2d958157d8043d5a7aca1263af2186fdf17e6c':
  Switch to the latest version of Caliper