Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 597d560 -s ours
* commit '597d560f2eb967bb8844af8062a0b387732ef7f1':
Import translations. DO NOT MERGE
Change-Id: I15b219164f6be508002ddbbf6a8c1f6c33449579
This commit is contained in: