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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 1cca2afe -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 35fe8393 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: af8f8401 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 78c9c883 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 8962e434 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 99226a05 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: fb4fc86c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7d7855e5 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 0832b5dd -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2034c9be -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 861892c3 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4285f124 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: c426b0e7 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 642f65d3 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 2624aec2 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4b44399a -s ours