Merge "Use the full SIM UICC to prevent possible collisions" into nyc-dev