Merge "Remove getNativeHandle() and getGrantors()" am: 5b177d1ec9
am: 6ad84b4d81

Change-Id: I4e9329da1a98f66af920dcc9469492b8073a1807