Merge "Fix pointer size mismatch"
am: 8aea017919

Change-Id: I6899c65773d1ab1fd61487faec504d453ad02e1f