Merge branches 'backport/v3.10.28-ltsi-rc1/mach-shmobile-fixes' and 'backport/v3.10.28-ltsi-rc1/mach-shmobile-for-rcar-snd' into backport/v3.10.31-ltsi/snapshot-merge