[automerger skipped] Merge "Require vendor users and groups to start with...
[automerger skipped] Merge "Require vendor users and groups to start with vendor_" into pi-dev am: 7b405f8b -s ours
am: 8dc2f9ed -s ours
Change-Id: Ib7fc0ad8e4c70af78d5e94d88d562f06e2efc4b3