Merge "Fix typo in I3ede36a8084fdae22d3aedd92703811d279a7829."