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

* commit 'b5377a7165a1f09c3cbd5c76f5a5745f6efc28e5':
  Fix null pointer exceptions in NetworkPolicyEditor