Merge "Hygiene: Use strtr() instead of str_replace() for character swapping"