Merge "Validate restore of NetworkPolicy settings" into pi-dev
am: 292d895fb2

Change-Id: I0337e151e8a47d413153160081e640b49f945318