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

* commit '4eb44e7a41666f019cba812943e7e13987bc20cc':
  envsetup: fix for provision to work on zsh