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

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