am 7228d0fd: Merge change 8213 into donut

Merge commit '7228d0fdd7fd151f033b09044a9ba94b2bc06b74'

* commit '7228d0fdd7fd151f033b09044a9ba94b2bc06b74':
  Resetting the setLanguage() call to its intended behavior after change 8089