Merge changes from topic "am-e935025ef3084980b813bbb4bc5cdc8d"

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 23b36ca8cb -s ours am: 365eefd24e -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2aa8378cbb -s ours am: 7991d357ec -s ours