Merge remote-tracking branch 'asoc/fix/davinci' into asoc-davinci