Merge "Support oem_#### users/groups for host_init_verifier"