Merge "Fix A/B update fail for 32-bit devices"