Merge changes from topic "am-48006da27498425ca097ed9afc18c015"

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7ba24097 -s ours am: d1d98406 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2a577fb7 -s ours am: 1edc9d2a -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a4a9743f -s ours am: b0b8ad6f -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5b08ae27 -s ours am: eb880edf -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: edaa622c -s ours am: 25a32f81 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 03e17aca -s ours am: 978898aa -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: b8c0735a -s ours am: d8b209f4 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3870fbd3 -s ours am: 26ab0e26 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 88dfba3a -s ours am: cc81e6d1 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4890b595 -s ours am: b188940e -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: b276a264 -s ours am: 2a8c1480 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c144d13d -s ours am: a4599349 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: e0a0fefc -s ours am: 0cd0fcea -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ee471092 -s ours am: 5df3d1cf -s ours