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