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

Change-Id: I3deff1a1b3b2330581d92d92f304d2ee6028fc30