Merge "eSIM deprecated API Refactoring"