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

* commit '0cd68e04a9f74aa5afc3e843db498568dd5fa173':
  Fix null pointer exceptions in NetworkPolicyEditor