The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/52ec5bf083e5cbd9f4e58672bde3624d9446bb8b

commit 52ec5bf083e5cbd9f4e58672bde3624d9446bb8b
Author: gogerald <gogerald@chromium.org>
Date: Wed Apr 05 19:00:58 2017

Use default country code if country code is not available in profile

BUG= 708686 

Review-Url: https://codereview.chromium.org/2797223002
Cr-Commit-Position: refs/heads/master@{#462164}

[modify] https://crrev.com/52ec5bf083e5cbd9f4e58672bde3624d9446bb8b/chrome/android/java/src/org/chromium/chrome/browser/payments/AddressEditor.java

Landed a possible fix. Will verify it when we know how to reproduce it.

Do we want to merge this to M58? It's a pretty simple fix.

Yes, please merge.

Your change meets the bar and is auto-approved for M58. Please go ahead and merge the CL to branch 3029 manually. Please contact milestone owner if you have questions.
Owners: amineer@(Android), cmasso@(iOS), bhthompson@(ChromeOS), govind@(Desktop)

For more details visit https://www.chromium.org/issue-tracking/autotriage - Your friendly Sheriffbot

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/c55b1112515342d8318c0ee0a86087d1f696620d

commit c55b1112515342d8318c0ee0a86087d1f696620d
Author: gogerald <gogerald@google.com>
Date: Wed Apr 05 23:48:23 2017

Use default country code if country code is not available in profile

BUG= 708686 

Review-Url: https://codereview.chromium.org/2797223002
Cr-Commit-Position: refs/heads/master@{#462164}
(cherry picked from commit 52ec5bf083e5cbd9f4e58672bde3624d9446bb8b)

Review-Url: https://codereview.chromium.org/2802783004 .
Cr-Commit-Position: refs/branch-heads/3029@{#597}
Cr-Branched-From: 939b32ee5ba05c396eef3fd992822fcca9a2e262-refs/heads/master@{#454471}

[modify] https://crrev.com/c55b1112515342d8318c0ee0a86087d1f696620d/chrome/android/java/src/org/chromium/chrome/browser/payments/AddressEditor.java