am 72521860: Merge change I8f657a99 into eclair

Merge commit '725218602e8505cd6fe3075253fcb792727e2431' into eclair-plus-aosp

* commit '725218602e8505cd6fe3075253fcb792727e2431':
  Avoid a crash trying to get a substring whose start is after its end.