Merge "Refactor system server benchmarks"