Merge "Fix the benchmark fail by caliper\'s change"
am: 92f9d53e98

* commit '92f9d53e988087277bb82203d36fdd8bcfbe9142':
  Fix the benchmark fail by caliper's change

Change-Id: I47cc1e570fb57c3ebc5cfb48071a3fe07b0fb2e4