Merge "Add NetworkStack app"