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

Change-Id: Iba9fb41a9768a103b9cfcfab73fc5eb146270227