Merge "Reformat only KR numbers with leading "+82"." into mnc-dr-dev

        String result = null;

        try {

            PhoneNumber pn = util.parseAndKeepRawInput(phoneNumber, defaultCountryIso);

            /**

             * Need to reformat any local Korean phone numbers (when the user is in Korea) with

             * country code to corresponding national format which would replace the leading

             * +82 with 0.

             */

            if (KOREA_ISO_COUNTRY_CODE.equals(defaultCountryIso) &&

                    (pn.getCountryCode() == util.getCountryCodeForRegion(KOREA_ISO_COUNTRY_CODE))) {

                // Format local Korean phone numbers with country code to corresponding national

                // format which would replace the leading +82 with 0.

                    (pn.getCountryCode() == util.getCountryCodeForRegion(KOREA_ISO_COUNTRY_CODE)) &&

                    (pn.getCountryCodeSource() ==

                            PhoneNumber.CountryCodeSource.FROM_NUMBER_WITH_PLUS_SIGN)) {

                result = util.format(pn, PhoneNumberUtil.PhoneNumberFormat.NATIONAL);

            } else {

                result = util.formatInOriginalFormat(pn, defaultCountryIso);