Merge tag 'backport/v4.1/mach-shmobile-to-v4.3-rc5' into backport/v4.1.10/snapshot