Merge "Merge remote-tracking branch 'gfiber-internal/vendor_drops' into master"