Merge "Use the new gsid interface"
am: c68c069db7

Change-Id: I7d8d96c8de5089360302deef783cf617a94a7abc