Merge "Add client methods and tests for system grants"