am 0370b9c3: Merge "Update for NetworkPolicy refactoring."

* commit '0370b9c3f76584462cffc3c283fcc70d9c8419c1':
  Update for NetworkPolicy refactoring.