Merge remote-tracking branch 'asoc/topic/davinci' into asoc-next