Merge branches 'cleanups/mx3-mm-v2' and 'cleanups/mxs' into imx-cleanup