Merge changes I4f38a539,Id4f6c7f4

* changes:
  Add the underlying networks to NetworkAgentInfo#toString.
  Improve testing for network blocking.