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