Merge "refactor updateIccId for msim"