Merge changes I9dfa5f59,Ib38e72a6

* changes:
  Convert getAdditionalPlmns to return a Set
  Allow Nullable Registered PLMN