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

Change-Id: Ic695e4fa29c471fb01f6d37f9cf4f7a3158a00a4