Merge "init: Fix a bug in MountDir"
am: c3d94633a2

Change-Id: Ia912188f6cef2bf4771f4010dc5e4430087cd1dd