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

Change-Id: Ifb6c5fd099e407fd7b8634701dd42bc23a901ef7