Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 06994e5e8c -s ours
am: 99687a6400 -s ours
* commit '99687a6400142454ca38917ada79b4491cd97f35':
Import translations. DO NOT MERGE
Change-Id: I5c14251bed900acab5477386255ff3d033219ef6
This commit is contained in: