Merge "Fix NPE in restoring network policies" into pi-dev