am 2fb8b8b9: am 4d3401e8: Merge "x86_64: Fix Test32RM"

* commit '2fb8b8b9abc001ab840c0327dd30e39291901fbc':
  x86_64: Fix Test32RM