Merge "Benchmark: Consistency in test names" am: b1bac93a52

Change-Id: Ic122450d1d7bf56cf94840d2626f9182fb6c1e2c