Merge "fs_mgr: Fix EnsurePathMounted with a given mount_point."