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