Issue #3283602 by urvashi_vora, eleonel, mrinalini9, ankithashetty, alexpott, Munavijayalakshmi: Fix repeated words (cherry picked from commit 5d4b6b4a)