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

* commit '1988540237a9521c0bf25f8c7368192b1b19584a':
  Double quote some statements for zsh compatibility

Change-Id: I648bb5a170cd693cd02465f05c552ba5e7fe77a6