Merge "benchmarks: remove more boilerplate." am: f5b44a5ea6 am: 6d4deb3454
am: 595b6fdfcb

Change-Id: I5f41a26c62c26f8f0ad9ee6207d5c75a3a4e5e49