Merge "Import translations. DO NOT MERGE" into nyc-dev
am: cace07e727 -s ours
* commit 'cace07e7271723232277e8dfe94799c80926c5ea':
Import translations. DO NOT MERGE
Change-Id: I7b6473f40f64a17b4f7417cf28c1e24d36a9c3ff
This commit is contained in: