Merge "Cast method pointer to uintptr_t before uint64_t"
am: a80465a56d

* commit 'a80465a56d404676eafd127f459f5f565c882445':
  Cast method pointer to uintptr_t before uint64_t