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

Change-Id: If82997f9f46a34014e797f10a71c34bfb4150585