Use indexOf(char) instead of indexOf(String) whenever possible

Change-Id: I6aee376b35df4b61abbdde8551281e937110bb7e