Added gsa and gss

Change-Id: Id42919ce48918766aef1d1800cdf6d939aeb0e00