am 73304bb6: Merge "X86_64: Proper IMT fix"

* commit '73304bb647aa620dcc4e67d3cf64c66b478a7212':
  X86_64: Proper IMT fix