am 8cb3d855: am e09a766f: x86 mterp: fix cherry-pick/merge, issue 3095771

Merge commit '8cb3d8558b3cdc3da00e736bb3cdb95adf653659'

* commit '8cb3d8558b3cdc3da00e736bb3cdb95adf653659':
  x86 mterp: fix cherry-pick/merge, issue 3095771