am 6464c7e4: am eac2bbf0: Merge "Add extra strchr testing."

* commit '6464c7e4437b73da41c1c77b0225fb0d964d7445':
  Add extra strchr testing.