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

Change-Id: Ie0225b35be8e1fcdfc56abae50ec5935bde34409