Merge "Add Scheduler Stats client unit test"