Merge "first_stage_mount: mount point must be canonical path"