Merge "Import translations. DO NOT MERGE" into nyc-dev am: 2b92ce7aaa  -s ours
am: b77c51b2cf  -s ours

* commit 'b77c51b2cf5554b74a8af04b1deac7e25a88dae8':

Change-Id: I031acc52eb9560aa9186ff0336b1d5fa7ac8c074