Fix cast from pointer to integer of different size am: aeb049f026 am: 5e5c1df313
am: afa9b69598

Change-Id: I7f2b209d92ec0562a1cd57498519d1dbe940873a