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

Change-Id: I89c77063c085e24b09e5326ceba6cc79376cfe75