Merge "Import translations. DO NOT MERGE" into nyc-dev am: 2ebc085  -s ours am: 3aa5844  -s ours
am: f07e184  -s ours

* commit 'f07e18469b79577b9a73d5cba575ee8d93ad22e8':

Change-Id: I786f7f1d02563a1bdfa0a0f357b784d8a5e8d19b