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

* commit '25791f6fc4c9f52196e25c882e8e6201616ab69e':
  x86_64: Several fixes required for enabling promotion