Merge "Refactor gsid to separate the installer code." am: 4df981dd46
am: 1eda03e9aa

Change-Id: I5afae7e9a9211dd2b0c30800836fa5d12e46f38f