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

Change-Id: I5320ae0ac8cca5ce01cb266c14c585a461da07ff