Merge "Rename TYPE_SP to TYPE_SP_GATEKEEPER"