Merge "Remove old migration from subId to ICCID"