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

Change-Id: I93719f5e624ad616599df3486c36808013c30e6a