Merge changes from topic "am-13ae750ccefb488f9ca94938517ccf87" into udc-dev

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: af9f89d93f -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d8e55a2a0d -s ours