Merge "Benchmark: Fixing error propgation for Async callback" am: bcb857727f
am: 9cd4858198

Change-Id: If3284d6b6f2222110f041a3db233addfac2d721f