am eee84588: am a8ceba1c: Merge "Plus code handling  for non-NANP CDMA carrier" into lmp-dev

* commit 'eee845885b88a660af79a912b3aa7062a503d361':
  Plus code handling  for non-NANP CDMA carrier