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

Change-Id: Ib25b8864a81a69b71cd3010b6ff8fa3c4a0eae8e