Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 13f9b39882 -s ours
* commit '13f9b398824b67be1f568c87f5595ad3e1d3085f':
Import translations. DO NOT MERGE
Change-Id: I1152c80ae5b7baf55c2aebf48a8257afa84dcc2e
This commit is contained in: