Merge "Import translations. DO NOT MERGE" into nyc-dev am: c40bc5298b -s ours
am: 0a40141216 -s ours
* commit '0a40141216361188fe9497dd5bd665d9189a8a9a':
Import translations. DO NOT MERGE
This commit is contained in: