Fixes regression from 73661c6f

Not sure why these need their own scp2 Module

Change-Id: I26386a5105b8244eacfcb1760091e8806c55abd8