Merge change 5962 into donut

* changes:
  SimRecords.getServiceProviderName() always returned null.