am 4d835ae0: am af2e6e1f: am 93266ed1: Merge changes I2998e40a,I03eacfa1

* commit '4d835ae06faf569e7cd57b47820fd37570f04c7b':
  Partially revert argument escaping.
  Uniformly escape shell arguments.