Fix cast from pointer to integer of different size
am: b743e03c9b

Change-Id: Ib42a068c6abcf4c984708dec61d23ecad29d39ed