Merge "Update for NetworkPolicy refactoring."