Merge "Fix 32-bit device tests"