am cccbcfe7: (-s ours) am c5a99042: Merge "Use "" to preserve argument word breaks"

* commit 'cccbcfe753d19b07eeef02c274d46ef987bedfbf':
  Use "$@" to preserve argument word breaks