Merge branch 'backport-3.17-automoc_timestamp_deps'