Merge "Fix build. Missing vendor_tag header."