Merge "Address API review for admin-granted permissions" into sc-dev