Punctuation and Gender i18n cleanups

Change-Id: I0e813aae732ef9b9250e031ede30ca3610cb6e85
Merge "Punctuation and Gender i18n cleanups"