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