Merge "Change package name for NetworkStack" am: 3c877d5b79 am: 21884d1f45
am: 79eb44a64a

Change-Id: Ib2c162850eb2f43fc3c17d0557a79ad9eadeed6a