am 859909fe: am b5377a71: Merge "Fix null pointer exceptions in NetworkPolicyEditor"

* commit '859909fee87d4dab6964977834a780acfd2310b2':
  Fix null pointer exceptions in NetworkPolicyEditor