Merge "Hygiene: Use [i] instead of charAt(i) for string index access"