More CM to SS transitions

Change-Id: Ic7ace103376dfa750c2136d7ddb7480246216856