Merge changes from topic "am-1ca2e1a47e4e423f9c474c66ed0d5d7e"

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 3ff7a1ecff -s ours am: 86459466ea -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: db2da4dd59 -s ours am: 17b91486d7 -s ours