Merge "Create misc_ce and misc_de directories on /mnt/expand" into tm-dev