Merge branch 'backport-3.17-automoc-path-prefix-off' into release-3.17