am 66cee1f9: Merge "Revert "Correctly add double quote to the space strippers"" into jb-mr1.1-dev

* commit '66cee1f92de0413756b8f306275d3508cd2b040f':
  Revert "Correctly add double quote to the space strippers"