Merge changes from topic "am-9b37212253724199965dad3bc04445a8"

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: b76573a8 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f365995c -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 1f601b9b -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 28f8e4b4 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: c7c2460e -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fca7e733 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 228868bd -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ee6f6273 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: e6b6cf3d -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7e5a7dbf -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 7a031192 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5989a926 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 1fcd74b8 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0015d0cf -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 08f22d3e -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5e84b2e -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 1fec9533 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d223f5da -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: dc81234d -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b2d10d4a -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: be11782c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5a6d5776 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: f7928a95 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3be142a8 -s ours