Merge "Remove hard-coded NetworkStack package name"
am: e765e8b7aa

Change-Id: I0e67a5e857d4f5ba2af1f0928be6d97c0f4ce94f