Merge "Make getNetworkInfo() take into account VPN underlying networks." into...
Merge "Make getNetworkInfo() take into account VPN underlying networks." into lmp-mr1-dev automerge: c38b90bb
automerge: 00c8450d
* commit '00c8450d':
Make getNetworkInfo() take into account VPN underlying networks.