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

Change-Id: I7d63ae00d079ceac64429ea1a538eb58142d54bc