Merge "Handle failures after partial mounts"