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

Change-Id: I679c9628e9563c965af4173992161b6eb754f78b