Merge "Plus code handling  for non-NANP CDMA carrier" into lmp-dev