Merge "Change package name for NetworkStack"