am 4c1840e6: am 5ea58543: Merge "mount: fix incorrect string length calculation"

* commit '4c1840e6547266ba251d8c34905036d73240ff57':
  mount: fix incorrect string length calculation