am 387d6e5f: am a83cf577: Merge "Add support to indicate whether intrinsics require an environment"

* commit '387d6e5fc1ef7656adaef02b496296b716ec84d3':
  Add support to indicate whether intrinsics require an environment