Merge "refactor(cm): move remaining EL2 save/restore into C" into integration