Refactor out requirement for a SP
[3.2.x] Interface-change!
ERM 23925
Change-Id: Ib8832acf0fca0341d4e1acee8b631ac907e3a80c