Merge "Import translations. DO NOT MERGE" into nyc-dev am: 917ead578b  -s ours
am: d2e1791807  -s ours

* commit 'd2e17918070aac1343197387162af2eb91dd73e6':

Change-Id: Ia1483bd00569b17ac59cf7117fb33c974272e856