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

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

Change-Id: I565969d64c85f1add76b18467db6ef8893662d0c