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

Change-Id: I80700dff771ba584f83b6625a43318c9fefd57be