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

Change-Id: I611b8a41cdd8db06d1ffd1590db5cb780fbe7cad