Fix 32-bit builds

Change-Id: I904bd077a0a519f296155ba0d83c083e8bca67d2