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

Change-Id: I921e50e48b0c93e31fa3d172c850629312f322e6