am 437eb9c3: Merge "Changes uses of index() to strchr()"

* commit '437eb9c3092c96c1828e326edb6574090fe37aaa':
  Changes uses of index() to strchr()