Merge changes from topic "am-d38654e08d584dccab8d45deae120eb0"

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 58d7b437e8 -s ours am: 38529d8709 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9dfec05f0f -s ours am: 13512fa04b -s ours