Merge remote-tracking branch 'asoc/fix/lm49453' into tmp