Merge remote-tracking branch 'asoc/fix/component' into asoc-linus