am 2fa34d42: am f8bacc2a: am 5c13d43f: Merge "x86_64: Handle UnsafeGet/Put equal to x86"

* commit '2fa34d429a0e59f8acad3f2c9b5a6af2811d0152':
  x86_64: Handle UnsafeGet/Put equal to x86