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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d04dc24d -s ours am: dd445a73 -s ours am: 025c77a1 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a4f092c7 -s ours am: ffd1ed3a -s ours am: 751b145c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f3457e40 -s ours am: 5020aeaf -s ours am: 71ff19c9 -s ours