Merge changes from topic "am-e44765c3a2e24ff6a5cf0ae1bcbb5be5"

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 8815a8f3 -s ours am: ef5da744 -s ours am: 913b71ef -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fa8a866e -s ours am: 916e67e3 -s ours am: 2180c44f -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 32228b01 -s ours am: 8c4e5f1e -s ours am: a3aa95a3 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8f6ddd1d -s ours am: c9af336b -s ours am: 0125d144 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 7ecd9524 -s ours am: 9717393f -s ours am: bcf6b83a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2fc1caf6 -s ours am: 467a3d7e -s ours am: 7d05706a -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 026e2190 -s ours am: 51fb5153 -s ours am: a38970c7 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bae6342e -s ours am: d03545fc -s ours am: 86a8ae06 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 01377735 -s ours am: 917ed36a -s ours am: 9629d618 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 14a2fee8 -s ours am: 7bd7efe0 -s ours am: 15577824 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 79533f31 -s ours am: caf14b61 -s ours am: 647b18f9 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e7e3b9e8 -s ours am: 5294dd85 -s ours am: a58b9394 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 27c67e36 -s ours am: fce8af19 -s ours am: b4db337c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 19261922 -s ours am: 2e1ebc79 -s ours am: 30fe1abd -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 352289a7 -s ours am: ae4688ce -s ours am: 29079da0 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 453ca089 -s ours am: 0eaed49f -s ours am: 35a4bc28 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 08566b11 -s ours am: f1bdc0e2 -s ours am: de53bbcb -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2db7ea7 -s ours am: 7727c9a7 -s ours am: 8d6ebaad -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: d378c09f -s ours am: 6a75a41b -s ours am: 198e15bf -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 61ab6234 -s ours am: fefee210 -s ours am: 3ae720e8 -s ours