Merge "Use the full SIM UICC to prevent possible collisions" into nyc-dev am: 629864c882 am: abae8206d3
am: 8ff9344250

* commit '8ff9344250968ce6a2c40513b8edf80698f078c4':

Change-Id: Ie18a2efd4e5cd950a4e401e78524db1edf73a1ea