Merge "Add Iccid_prefix field"
am: 01d9adfee4

Change-Id: Ie01b179eb9f704ff174540a626cab074f91c156e