Fix 32-bit builds

Change-Id: I09049db51668176b90dabe2c82d525b2fab60299