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