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

Change-Id: I52b9086c09d762e0995b4f3b981e54f2175d673c