Merge "Import translations. DO NOT MERGE" into nyc-dev
am: bd0f1fc -s ours
* commit 'bd0f1fcd67cd4510e94822323a33a138f5477319':
Import translations. DO NOT MERGE
Change-Id: I287365ca7ed1878bc5d57a9c07680e26bad4b9f7
This commit is contained in: