Merge "add duplication check for more carriers" am: d78c45eb48
am: a4e33bee82

Change-Id: Ic6f5f1eef36b21805c03d2b0785d739e2da755c2