Merge branch 'asoc-4.17' into asoc-4.18 merge window