Merge "fix(cpus): fix incorrect AMU trap settings for N2 CPU" into integration