Merge remote-tracking branch 'gfiber-internal/vendor_drops' into merge_rc11.3

Change-Id: Ibdf93626acf566c18622a468b0ed1077a0fed1b1