Merge "fix(intel): update boot scratch to indicate to Uboot is PSCI ON" into integration