Merge "fix(cm): update gic el2 sysregs save/restore mechanism" into integration