Merge "Be on the safe side: emit an environment for runtime calls."
am: 99b4d43c7b

* commit '99b4d43c7b2c81a0a4712578016efdfc65cdc21b':
  Be on the safe side: emit an environment for runtime calls.