Revert "Delete GSS"
am: e18588381b

Change-Id: I3a2dfd1db3843402b4b64e27fcbaf2596d9d66bc