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

* commit 'e016e36162baabdf7ee4120a57cde18b2989c88c':

Change-Id: I1ee38c9b78be87c2f24c9887e4dd066ab759e170