Merge "Add Punjabi translation support (1/2)" into cm-10.2