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

Change-Id: I57f5bc36b6433ccb4514e6a131af2d1f022968cc