Merge "Clean up punctuation in SIM locked strings." into pi-dev