Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: c220ad0  -s ours

* commit 'c220ad0d802ffb2f1bedfe7e7870d493d5b3773e':
  Import translations. DO NOT MERGE

Change-Id: I703786424337cb70c18588d5762478c0c19cc793