Merge "switch SIM refactor to support MEP"