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

Change-Id: I4b9387fdc227fae480c15da3512ce1354d243a6a