Merge "Avoid volatile 64-bit tearing on 32-bit architectures."