Merge "Support oem_#### users/groups for host_init_verifier" am: fe80d069a0
am: e33a115a39

Change-Id: Ib05f82a59ebffca215c9d9efd8645621d3a538f5