[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 5f2cebc10a -s ours am: b518fd475c -s ours am: 463f6ab492 -s ours am: 4f926f4a35 -s ours am: d9b2a2acec -s ours

am skip reason: subject contains skip directive

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