Merge changes from topic "am-900835d502114d3685db714f5dd1f7ed" into tm-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 76eeaa757b -s ours am: f4e2e03c3e -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c40d29d27d -s ours am: 9e0bfdaf94 -s ours