am 8bfba7df: Merge "fix wrong substring"

* commit '8bfba7df376509cc944b80bd1f1715f1ef94b246':
  fix wrong substring