Merge "Revert "Disable the plus sign conversion in non-NANP system""