Merge "Import translations. DO NOT MERGE" into nyc-dev am: 10e29e0730  -s ours am: 27bdfbf794  -s ours
am: e55d263d7a  -s ours

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

Change-Id: Iaf7100da143955d62ad5f820d8cb52e2be861322