Merge "Clean up punctuation in SIM locked strings." into pi-dev am: 8375834cc8
am: d952116e47

Change-Id: I7bc495158f2fc91f4923dfb3410b42575eebb725