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

commit 4bad57e09d4f88da3b7a296b90980d464a942b87
Author: rogerm <rogerm@chromium.org>
Date: Fri Oct 21 19:24:13 2016

[autofill] Update autofill address rewriter rules.

Most if the changes are due to sort order of the rules, which has now been more fully specified. The rules used to be in order of decreasing length, with unspecified order for rules of the same length. Rules are now sorted on order of decreasing length and then in lexicographical order.

BUG=620414,  658303 

Review-Url: https://chromiumcodereview.appspot.com/2434003003
Cr-Commit-Position: refs/heads/master@{#426861}

[modify] https://crrev.com/4bad57e09d4f88da3b7a296b90980d464a942b87/components/autofill/core/browser/address_rewriter_rules.cc

Your change meets the bar and is auto-approved for M55 (branch: 2883)

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

commit 10e5abd6805b97aabaf3e5102d22b45538920e0f
Author: Mathieu Perreault <mathp@chromium.org>
Date: Tue Oct 25 19:06:44 2016

[Merge M55][autofill] Update autofill address rewriter rules.

Most if the changes are due to sort order of the rules, which has now been more fully specified. The rules used to be in order of decreasing length, with unspecified order for rules of the same length. Rules are now sorted on order of decreasing length and then in lexicographical order.

BUG=620414,  658303 

Review-Url: https://chromiumcodereview.appspot.com/2434003003
Cr-Commit-Position: refs/heads/master@{#426861}
(cherry picked from commit 4bad57e09d4f88da3b7a296b90980d464a942b87)

Review URL: https://codereview.chromium.org/2450583003 .

Cr-Commit-Position: refs/branch-heads/2883@{#290}
Cr-Branched-From: 614d31daee2f61b0180df403a8ad43f20b9f6dd7-refs/heads/master@{#423768}

[modify] https://crrev.com/10e5abd6805b97aabaf3e5102d22b45538920e0f/components/autofill/core/browser/address_rewriter_rules.cc

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

commit 10e5abd6805b97aabaf3e5102d22b45538920e0f
Author: Mathieu Perreault <mathp@chromium.org>
Date: Tue Oct 25 19:06:44 2016

[Merge M55][autofill] Update autofill address rewriter rules.

Most if the changes are due to sort order of the rules, which has now been more fully specified. The rules used to be in order of decreasing length, with unspecified order for rules of the same length. Rules are now sorted on order of decreasing length and then in lexicographical order.

BUG=620414,  658303 

Review-Url: https://chromiumcodereview.appspot.com/2434003003
Cr-Commit-Position: refs/heads/master@{#426861}
(cherry picked from commit 4bad57e09d4f88da3b7a296b90980d464a942b87)

Review URL: https://codereview.chromium.org/2450583003 .

Cr-Commit-Position: refs/branch-heads/2883@{#290}
Cr-Branched-From: 614d31daee2f61b0180df403a8ad43f20b9f6dd7-refs/heads/master@{#423768}

[modify] https://crrev.com/10e5abd6805b97aabaf3e5102d22b45538920e0f/components/autofill/core/browser/address_rewriter_rules.cc

[Automated comment] removing mislabelled merge-merged-2840

[Automated comment] removing mislabelled merge-merged-2840