Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 90edb46 -s ours
* commit '90edb46d017f793401f65c64368a7a4cf6f881f9':
Import translations. DO NOT MERGE
Change-Id: I117fb5328c018acba51075910c78af1ac4fa9035
This commit is contained in: