[automerger skipped] Merge "Strip trailing Fs off raw ICCID" am: 7a580e32 am: 7bbf17dc
am: 4543ccf7 -s ours
am skip reason: change_id Ib83d540fafe31c074375678d1cb913a11e505620 with SHA1 0a085953 is in history
Change-Id: Ib240af28e068112d672121cabd87c9a125bae1ba