[automerger skipped] Merge "Add new vendor prefix data files" am: 5de3c5fe...
[automerger skipped] Merge "Add new vendor prefix data files" am: 5de3c5fe -s ours am: d8283a15 -s ours
am skip reason: Change-Id I34ea8aad5de89e4cfeb76303c2e448aefe673f63 with SHA-1 83259f2c is in history
Change-Id: Iff1cb9c5a1044978468e74096099c0552851c47a