am 129f1946: Merge "Prevent index out of bounds when using String.substring." into lmp-sprout-dev

* commit '129f1946a1bc32ac519334283538c9e24588e998':
  Prevent index out of bounds when using String.substring.