Merge "Remove hard-coded NetworkStack package name"