Merge changes from topic "am-783809c7ca4b483db6c95715ef64a24f" into tm-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7c21f2ea -s ours am: 323d7fa3 -s ours am: 8849c71d -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c3d8f34 -s ours am: 5d5b545e -s ours am: dd993363 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6a44c6af -s ours am: f15ab25c -s ours am: 5d07821c -s ours