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