Merge "[NetworkPolicy]: Fixes the crash issues caused by null pointer."
am: 2438a33e54

Change-Id: I5e8e5048718edf82008b58964d90b3cc10115c71