Merge "Import translations. DO NOT MERGE" into nyc-dev am: 0246325287  -s ours am: e4607a098c  -s ours
am: 78a3412f39  -s ours

Change-Id: Ic4b01cdcd778fe1c095832844c90d12b4f6eba26