Merge change 22362 into eclair

* changes:
  Fix +NANP issue and cleanup plus code conversion.