Merge "Fix exception in save/restore of EL2 registers." into integration