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

* commit '3d5ecf13e01da262b95ff78486297af3a0601d0c':
  Prevent index out of bounds when using String.substring.