Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 970d613 -s ours
* commit '970d613f8f871973f66a0cae6dac5f4e91b1f72c':
Import translations. DO NOT MERGE
Change-Id: Ibc06c50d719a7169f2813996d5b531c0e856531b
This commit is contained in: