am 7acd310d: am f9ff4fb5: Merge "Revert "Only add spaces automatically when...
am 7acd310d: am f9ff4fb5: Merge "Revert "Only add spaces automatically when appropriate."" into jb-mr1.1-dev
* commit '7acd310d':
Revert "Only add spaces automatically when appropriate."