Merge "Import translations. DO NOT MERGE" into nyc-dev am: 33793c58fa  -s ours
am: b8d309d8c4  -s ours

* commit 'b8d309d8c4cfb8648c1e9e62102248a4dd83007e':

Change-Id: I14c84553ba58bc948e1f11d81f3dcdca03ab1b89