Merge "Cleanup testOverrideVendorId static member after running unittest."