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

commit dd620397ad0c34407786c98f779cd2021f676a84
Author: sebsg <sebsg@chromium.org>
Date: Fri Jan 27 22:44:03 2017

[Autofill] Transfer billing address of server cards when deduping.

BUG= 686214 

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

[modify] https://crrev.com/dd620397ad0c34407786c98f779cd2021f676a84/components/autofill/core/browser/personal_data_manager.cc
[modify] https://crrev.com/dd620397ad0c34407786c98f779cd2021f676a84/components/autofill/core/browser/personal_data_manager.h
[modify] https://crrev.com/dd620397ad0c34407786c98f779cd2021f676a84/components/autofill/core/browser/personal_data_manager_unittest.cc

Your change meets the bar and is auto-approved for M57. Please go ahead and merge the CL to branch 2987 manually. Please contact milestone owner if you have questions.
Owners: amineer@(clank), cmasso@(bling), ketakid@(cros), 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/+/0ec4b4f234e60dcb88844e5ef83dd8e39e70ad17

commit 0ec4b4f234e60dcb88844e5ef83dd8e39e70ad17
Author: sebsg <sebsg@chromium.org>
Date: Fri Feb 03 18:13:08 2017

[Autofill] Transfer billing address of server cards when deduping.

BUG= 686214 

Review-Url: https://codereview.chromium.org/2660633003
Cr-Commit-Position: refs/heads/master@{#446804}
(cherry picked from commit dd620397ad0c34407786c98f779cd2021f676a84)

Review-Url: https://codereview.chromium.org/2674573010 .
Cr-Commit-Position: refs/branch-heads/2987@{#291}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}

[modify] https://crrev.com/0ec4b4f234e60dcb88844e5ef83dd8e39e70ad17/components/autofill/core/browser/personal_data_manager.cc
[modify] https://crrev.com/0ec4b4f234e60dcb88844e5ef83dd8e39e70ad17/components/autofill/core/browser/personal_data_manager.h
[modify] https://crrev.com/0ec4b4f234e60dcb88844e5ef83dd8e39e70ad17/components/autofill/core/browser/personal_data_manager_unittest.cc