Merge "Make VariableHandleScope consistent between 32 & 64 bit"