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