am 6c9e2125: Merge change 2264 into donut

Merge commit '6c9e21254c65a16a9847f7dd5f4c05b61f6e6dc0'

* commit '6c9e21254c65a16a9847f7dd5f4c05b61f6e6dc0':
  Remove the msgId string-stealing-hacks because we will do new translations for donut.