Merge "Use the new gsid interface" am: c68c069db7
am: a0dc5e8e10

Change-Id: I1629d237b7dbd4c816b8a7f762722d7e20241e92