Fixup before upstream merge#5367

ujfalusi merged 2 commits intothesofproject:topic/sof-devthesofproject/linux:topic/sof-devfrom

bardliao:fixup-before-mergebardliao/linux:fixup-before-mergeCopy head branch name to clipboard