Merge changes from topic "am-ec9909332fce4d5bbaa869bb48b9491b" into tm-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: b3be01e613 -s ours am: bf63ca4b29 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 09233f3f1c -s ours am: 77072be075 -s ours