Merge "Add user/group for gsid."
am: 9747a65380

Change-Id: Ia3d0ddb8997e8c4739cb33c709bb9606e2a518dd