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

Change-Id: If9a347e461af21e1052553b9e27c414d09109ad6