Merge "Revert "Revert "Set cpu_mode/cpu_model for E\ models"""