am a81fe3d5: Merge "x86_64: Several fixes required for enabling promotion"

* commit 'a81fe3d512ef846aad3398222afd1f0588bbaf7c':
  x86_64: Several fixes required for enabling promotion