Merge "fix(cpus): fix minor issue seen with a9 cpu" into integration