[automerger skipped] Merge "Import translations. DO NOT MERGE" into mainline-prod am: 917b3869fe -s ours am: 6c2fce2ef2 -s ours

am skip reason: subject contains skip directive

Change-Id: I46b2a18414622a10266b17168f7b0e67c9e3f4d3
tree: 9b6b6c33fde0c19baf15e2adf46046c4af4979eb
  1. Tethering/