Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 58a1a07 -s ours
* commit '58a1a07470456290b0b5e25ddeb07a6247962b88':
Import translations. DO NOT MERGE
Change-Id: If35a4943aec1855b44250d495a034c1b73b4ea49
This commit is contained in: