Merge "Change package name for NetworkStack"
am: 3c877d5b79

Change-Id: I882eb1e57e45269a048f0986c0c371eed894ce61