Merge changes I6eca0331,I346323cb

* changes:
  Support selecting non-INTERNET networks as underlying networks
  Store priority class as final in UnderlyingNetworkRecord