Merge changes from topic "am-48006da27498425ca097ed9afc18c015"

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: ba4dc8f0 -s ours am: c1c4d6c9 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ea2e6b36 -s ours am: a88a0eff -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d8d85a84 -s ours am: d7fd4469 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7d99401b -s ours am: 032bd77d -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 8c296cdd -s ours am: 978d5275 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d152c7b1 -s ours am: b0461204 -s ours