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

Change-Id: If7a86010194cf7650b1fc6c8be70ac209bf958b2