Merge "fix(intel): update stream id to non-secure for SDM" into integration