Merge "Add non-interactive system server benchmarks"