Merge "Add ICCID_PREFIX column in CarridId DB" am: 73200d9ac9
am: 33395ea925

Change-Id: Ied8bb4b9302533bc13ebcd49c80cdd1ca6c0641d