Revert^2 "Delete GSS"
am: f75dce49eb

Change-Id: Iec4edca12f29a4018302699c752d81a631d29cf1