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

* commit '576d628d7089a1fea5a7ff9ad6b9095c177bd4b1':
  Fix locations at environment uses.