Merge changes from topic "am-5a8e03ce09e8431d82ff7de21458bacd"

* changes:
  Merge changes from topic "am-f41ce26583ca44729c5d6c2e1dcadaae" into udc-dev am: 8e65786778 am: 3a0c7ad7af
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 02768bcf3b -s ours am: 9dd47f01d4 -s ours am: 39d8c641b6 -s ours