Merge "Revert "Enabled NetworkPolicy backup and restore.""