Merge "Benchmark: Consistency in test names" am: b1bac93a52 am: 956e2618bd am: 9d4867f606

Change-Id: I41e095b0a02b91f0d260d553a23ec70500bdbbc9