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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 8a725e7491 -s ours am: 2855819cf6 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6d688641c5 -s ours am: 037c212fa0 -s ours