am f861bc5c: Merge "Don\'t search off the end of the index for bad Olson ids."

* commit 'f861bc5cc3e17322e49f89deea61f278aaefbe76':
  Don't search off the end of the index for bad Olson ids.