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

Change-Id: Ic93c22e03a4ead4ec37b955993a32c8ce284e0a6