Merge "envsetup: fix for provision to work on zsh" am: 4eb44e7a41
am: 02156d1469

* commit '02156d14691f4436effc63b828f9a2b7906ab3ef':
  envsetup: fix for provision to work on zsh