Avoid dups in company drop-down

Change-Id: Ia966527636f1024a664c2f33167590a9308e6191
Merge "Avoid dups in company drop-down"