Merge changes from topic "am-7ee080511733486ca029b82ac27573ed"

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 1f23d6ff -s ours am: c7e72b14 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fea01518 -s ours am: d583e6f5 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 8e240b41 -s ours am: 7ded154c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 000e64a4 -s ours am: acabbd02 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 1ae883aa -s ours am: e30844ae -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6133d728 -s ours am: 1f8a9c3d -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: bf1a655e -s ours am: e83eeda9 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2e1ac18b -s ours am: 02db6647 -s ours