Merge "init: Fix a bug in MountDir"