m8spr: more commonizing

Change-Id: If0140a04fbe4a9267cdc1721ff1d497750082580