Address flan@'s comments on GSS.

The change Iae743842c5707c0231b1c4eb290f7914b6f7a501 has been merged
before flan@ posts all his comments.
This change will address all of his last comments.

Change-Id: I12c7a7afeab4a6a56b19aee2543eaaeacbc62566