Merge "Support starting gsid lazily"
am: 4108388601

Change-Id: I5f6a9e3492cf41c2681297ce770310cda862de3d