[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 73f2ecbcd6 -s ours am: 4eaac7f546 -s ours am: 60f2dc6fcf -s ours am: df7443a792 -s ours

am skip reason: subject contains skip directive

Change-Id: I61c3d0186620404685d2730a52213ebc4a6ac24e
tree: b8731ad5fb3281d3836d970c6e2f0cb7305def97
  1. Tethering/