Merge changes from topic "am-25d5d76ca46e4430a3b3dfa6bff0dfdc" into udc-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: cbe87789 -s ours am: 90e7cfac -s ours am: f4fe175b -s ours am: b5d2ff6e -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ebacced1 -s ours am: 07b8d85c -s ours am: ed9ae7fd -s ours am: 6f28fb73 -s ours