Fixing typos, improving the meaning of sentences, using entities, and making words or phrases more consistent (cherry picked from commit 5dcecb27) backport to 4.12.1