Merge changes from topic "am-f25e42fa-b5ec-433f-bd08-bcaed5b1cf23" into ub-launcher3-master

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 1144a8068e
  Import translations. DO NOT MERGE