Merge "API review: change getKeyPairGrants return type" into sc-dev