Merge changes from topic "am-d6bdcb449e9b4a249fd5201e573a8af6"

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 1f23d6ff -s ours am: e70e8725 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fea01518 -s ours am: 4da29d6f -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 8e240b41 -s ours am: e9158102 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 000e64a4 -s ours am: 5f3efc40 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 1ae883aa -s ours am: acd44f07 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6133d728 -s ours am: fe8fb12d -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: bf1a655e -s ours am: 7fafc940 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2e1ac18b -s ours am: 7858b1bf -s ours