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

* commit 'cd9bc7f4e35412a2bf23fb2471ba93ae52e4d46a':
  Use the full SIM UICC to prevent possible collisions

Change-Id: Iaa2e147d35e0dfdb611729d537ef77c36e8f52f3