[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 7d04cce017 -s ours

am skip reason: subject contains skip directive

Change-Id: Ib751cff1cd1bdc2cd1ffd6139956c47ec9207f9e
tree: 29226f7a7425d8ba798ebed006ecff19320de395
  1. Tethering/