Merge remote-tracking branch 'asoc/topic/component-platform' into asoc-next