Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 24708d9c8e -s ours
* commit '24708d9c8e54701d6c3ee20f72e8dfb09d0f5c75':
Import translations. DO NOT MERGE
Change-Id: I1f93f0ce7bdbf80b0c13fbd3678c08675e7396e8
This commit is contained in: