Merge "sp_min: Avoid platform security reconfiguration" into integration