Merge changes from topic "am-8b32e0f40c3d4206b024560c62beaf38" into udc-dev

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 55e2dc06b4 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 45a95c686e -s ours