Merge "Strip trailing Fs off raw ICCID"