Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 31cd8615b2 -s ours
* commit '31cd8615b2cd7cf04e00a87c7981264c1b180356':
Import translations. DO NOT MERGE
Change-Id: I90116fb8e02a06ab13cb9c7169371f931fdea508
This commit is contained in: