Merge "Update the API for permission set/clear."