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