Merge "fs_mgr: Fix EnsurePathMounted with a given mount_point."
am: 3c94eaad5f

Change-Id: I311f5bea3c515d6db5c1fa37b436b17290573f70