sq: make sure SP override works everywhere

Change-Id: I37dcacda03638d92fd9539db75b9f52be3900477