Revert "Correctly add double quote to the space strippers"

This reverts commit af7264abb7abfc0dab08d332b10b9ec8a6b48dc6

Change-Id: I5673103c4a0e9c48df563187d2188ca6e2f15877
bug: 7561815
Merge "Revert "Correctly add double quote to the space strippers"" into jb42