Fix cast from pointer to integer of different size am: 8caa27c260
am: 264935ecd6

Change-Id: Ia1fc2f749cc873560bcf56c41e01334986bd1c7b