Merge "Patch to update QC CDMA MO SMS change"