Merge "Add annotation for Vpn#getNetwork()" into sc-dev