Merge "Add more system server benchmarks"