Merge "fix(intel): update boot scratch cold register to use cold 8" into integration