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

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