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