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