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

This reverts commit 698fdfb8979a2fbe36364f100ca683679d5841c2.

Change-Id: I800b481f46953dd66abd79a54d0411cfcc0216c1
1 file changed