Merge "Double quote some statements for zsh compatibility"
am: 576fd3ebb9

* commit '576fd3ebb92d2200ea8c02cd6f3b7ba21ced9030':
  Double quote some statements for zsh compatibility

Change-Id: I30ff4c9d527907772d11d557097fafb2cbeeb590