group all scm masks

Change-Id: If92b47d29542b5731faf07996c56ca6e4d484e9c