Merge "Revert "Add attribution tags for VCN and VPN""