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

Change-Id: I497d003c499afdfcbf121eb7db8066771bfe5f3c