Merge "Add Iccid_prefix field" am: 01d9adfee4
am: 7604974d0b

Change-Id: Iac8e55b5488c5d14058b21083870b5a12357ad25