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

Change-Id: Ic4e18aa3253a6b5d00e441a47b025e1a2b09cf24