Merge "[MEP] eSIM deprecated API Refactoring"