Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 7ffeda3633
-s ours
* commit '7ffeda3633ee5296e8403da1042ac4e7321a3023':
Import translations. DO NOT MERGE
Change-Id: I49ec349b40cbc6715479d3b0968337f05d4f9b12
This commit is contained in: