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

Change-Id: Ide643f03fac7ea01e96261dee7c16d17cf724e44