Merge "Use distinct GateKeeper userids when running a GSI." am: 5a465412b1
am: e4c58c492c

Change-Id: I7f0515095e883a4a42f5fa738388c85fa4e81951