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