refactor for SS 3.5x

Change-Id: Ieda9e2988a45c2cbc09f21ec373ad50ea0d2b4c1