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