Merge changes from topic "am-52a8f1e812834d788cd70facb9ea6640" into tm-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: c5c9bc9787 -s ours am: 9e6e92ac3f -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c56d641df4 -s ours am: b44305acab -s ours