[1.5.x] Fixed minor typos.

Backport of 44d40ba521 from master