Merge "Fix pointer size mismatch" am: 8aea017919 am: cfe388d165 am: 7011433aea
am: c75e0ae7a3

Change-Id: Ib66d19c12d79604578260ae9a33c1e51f426cb43