Merge "Add iccid support for mvno data"