Apply vanilla 3.12.1 patches
Apply vanilla 3.12.4 patches
Merge branch 'master' into vanilla-imx (3.12.4)