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

Change-Id: I5dbaa5535ac8ea57dfdb74acbb3ed6e0a6a63879