am 93266ed1: Merge changes I2998e40a,I03eacfa1

* commit '93266ed1f71a88af5ce5010235dfb9afbe43b289':
  Partially revert argument escaping.
  Uniformly escape shell arguments.