Exporting internal changes back to open-source. (#2627)
Exporting internal changes back to open-source. (#2627)

NOTE: This is an automated export. Changes were already LGTM'd internally.

BUG=35968999
applift/vitess,tirsen/vitess,rnavarro/vitess,HubSpot/vitess,applift/vitess,pivanof/vitess,sougou/vitess,rnavarro/vitess,davygeek/vitess,tinyspeck/vitess,dcadevil/vitess,pivanof/vitess,sougou/vitess,mahak/vitess,dcadevil/vitess,tinyspeck/vitess,applift/vitess,rnavarro/vitess,alainjobart/vitess,mahak/vitess,tirsen/vitess,mattharden/vitess,vitessio/vitess,vitessio/vitess,davygeek/vitess,mattharden/vitess,tinyspeck/vitess,enisoc/vitess,mattharden/vitess,pivanof/vitess,tinyspeck/vitess,sougou/vitess,pivanof/vitess,enisoc/vitess,tirsen/vitess,davygeek/vitess,rnavarro/vitess,applift/vitess,mattharden/vitess,alainjobart/vitess,HubSpot/vitess,enisoc/vitess,pivanof/vitess,mahak/vitess,applift/vitess,alainjobart/vitess,mattharden/vitess,tirsen/vitess,davygeek/vitess,HubSpot/vitess,mahak/vitess,pivanof/vitess,mahak/vitess,vitessio/vitess,alainjobart/vitess,davygeek/vitess,HubSpot/vitess,dcadevil/vitess,mattharden/vitess,sougou/vitess,HubSpot/vitess,mahak/vitess,HubSpot/vitess,dcadevil/vitess,rnavarro/vitess,rnavarro/vitess,mattharden/vitess,tinyspeck/vitess,tinyspeck/vitess,alainjobart/vitess,mattharden/vitess,alainjobart/vitess,tirsen/vitess,alainjobart/vitess,enisoc/vitess,tirsen/vitess,tirsen/vitess,alainjobart/vitess,tirsen/vitess,tinyspeck/vitess,enisoc/vitess,enisoc/vitess,HubSpot/vitess,enisoc/vitess,mahak/vitess,dcadevil/vitess,sougou/vitess,rnavarro/vitess,tirsen/vitess,mahak/vitess,vitessio/vitess,applift/vitess,applift/vitess,mattharden/vitess,vitessio/vitess,rnavarro/vitess,rnavarro/vitess,davygeek/vitess,sougou/vitess,sougou/vitess,applift/vitess,vitessio/vitess,pivanof/vitess,dcadevil/vitess,applift/vitess,pivanof/vitess,applift/vitess,dcadevil/vitess,sougou/vitess,davygeek/vitess,mattharden/vitess,vitessio/vitess,vitessio/vitess,HubSpot/vitess,pivanof/vitess