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

* commit '513f68bc5a5f15d799f8795392d4861a5704fba1':
  fix wrong substring