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