Fix cast from pointer to integer of different size am: b743e03c9b am: 355dab45c4
am: 5b1a7d752f

Change-Id: I2f0c072ff60de4f04c21c14083699f3f41114b9e