Merge "Benchmark: Add CSV support" am: d7fad5f8ed am: d8037809d1

Change-Id: Ic59da389659f3e9332d0352a6714ad4aa33c5e72