Merge "refactor(cm): minor update on conditions used in prepare_el3_exit" into integration