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