Merge "Disable on stack replacement for now."
am: a50d9c81d0

* commit 'a50d9c81d0d5b91e6c7341a59ca601ce5b63012a':
  Disable on stack replacement for now.