Merge changes from topic "am-2be15bdac23f4f3daa8bb0eda9805d00"

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d82722f5 -s ours am: f6c3ffed -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c8035f9c -s ours am: 4d7deb8d -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 18ffbdbe -s ours am: 73b57c67 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d2d977cc -s ours am: 76ad5ab6 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 377265ba -s ours am: f5b72c67 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0423f122 -s ours am: 9f0a0219 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 78a4e25f -s ours am: 31a68ff8 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 05875915 -s ours am: 0fdd1024 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c01f0709 -s ours am: 830ca185 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7d916565 -s ours am: 15d274c1 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 781dd48c -s ours am: b342c176 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7bb2a855 -s ours am: b9608cc8 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c347fcb8 -s ours am: 6396ce70 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b07ac4d6 -s ours am: 45fd6665 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 1ee935c5 -s ours am: cfffaed9 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 68b92a72 -s ours am: 61a23ae0 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: bee63f09 -s ours am: a023bebd -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b7248b3c -s ours am: 3bd645fa -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d577552b -s ours am: 98668915 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a291d34e -s ours am: 5a3f565e -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 978ea9a0 -s ours am: 0188e9f7 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 96899bff -s ours am: 5baacd81 -s ours