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

Change-Id: I6d194662825bb794acd6c799444d35275d567da8