Merge "Add Iccid_prefix field" am: 01d9adfee4 am: 7604974d0b
am: c8b58d3512  -s ours

Change-Id: I72e0d22cf02636aa3ee938ffd5bb1ecf86b43873