Merge changes from topic "am-69e1cda62e924ff586d18e2ae2750b3c"

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 8064923875 -s ours am: da4bb792ae -s ours am: 4ca14ea04d -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: eab411141b -s ours am: c3f9c6dfdf -s ours am: 51d1ddcd9d -s ours