am bfe20d1a: am 8bfba7df: Merge "fix wrong substring"

* commit 'bfe20d1aa1b1236e6592914c5682c59d94936432':
  fix wrong substring