Merge "Remove @hide usage and fix NetworkPolicy backup"