Fix cast from pointer to integer of different size am: b743e03c9b am: 911f176567 am: 452cd40d64
am: 7f23da12fc

Change-Id: Ida3ef7ccec9e6393a88de8f0dbd58c141c23ce5d