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

Change-Id: I4f513909d4abb37d8a61846d785a61feedc24552