Merge changes from topic "am-cbc9ff5c30f349e3931e75f65de06c8e" into udc-dev

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 70727e87eb -s ours am: 3336c8ef2b -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9988e9e1fd -s ours am: 210f096992 -s ours