Merge branch 'backport-autogen-target-depends' into autogen-target-depends-fix-3-9-2

Use the "ours" merge strategy because we already have equivalent
changes on our side.
2 jobs for autogen-target-depends-fix-3-9-2