Merge "mount: fix incorrect string length calculation"