am 333881c4: am 1f256e94: am 66cee1f9: Merge "Revert "Correctly add double quote to the space strippers"" into jb-mr1.1-dev * commit '333881c4': Revert "Correctly add double quote to the space strippers"