Merge "Fix pointer size mismatch" am: 8aea017919
am: cfe388d165

Change-Id: I32bd03e8e60248db25b9b04e90477018a2fccd41