Merge "Double quote some statements for zsh compatibility" am: 576fd3ebb9 am: 29c2c4db19
am: 9cdb6f1a31

* commit '9cdb6f1a31a93f842d927c79c5d9ba0e1271422c':
  Double quote some statements for zsh compatibility

Change-Id: If0dc496ce9780b0bf3ac42fd3df82a927b24dadc