Merge "Validate restore of NetworkPolicy settings" into pi-dev