Merge "Remove getNativeHandle() and getGrantors()"