Merge branch 'asoc-fix-rcar' into HEAD