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

Change-Id: Ifea743724cf1e71f3cb742b20037f92684ded294