am 6b63e92f: Merge "Fix locations at environment uses."

* commit '6b63e92f00220a008ef8bbc77912129a709771f8':
  Fix locations at environment uses.