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