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

Change-Id: I9c1357caab2a3f1cdc8f5c608275b73806098203