Merge "Remove trailing period from missing SIM string" into jb-mr1-dev