Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 4498308 -s ours
* commit '44983082a7d244a86dfd3b90094784507eadf119':
Import translations. DO NOT MERGE
Change-Id: I88583e5bf133fb3372bc4eaa440d7018432d5541
This commit is contained in: