Merge "Make getNetworkInfo() take into account VPN underlying networks." into lmp-mr1-dev
automerge: c38b90b

* commit 'c38b90bb6bc5efc5f07e69b86d10f76a1eaa9eb4':
  Make getNetworkInfo() take into account VPN underlying networks.