Merge "Fix potential deadlock accesing the value of ICCID" into sc-dev