Ensure that there is always a space after a comma

NEVER BEFORE!

Bug: 63742
Change-Id: I224495b7065bf36a237e905b592c8af7b69bb664