Merge "Support starting gsid lazily" am: 4108388601 am: c48af5916b
am: 49311a2242

Change-Id: I1499c37a9687ee1f1535e4e2572e6577e0a42e4d