Merge "Fix NPE in restoring network policies" into pi-dev am: a1b34a43a2
am: 8fcff1e013

Change-Id: Idb49cf9b4c2be5772e0bb12e4177abafadcc232c