Merge "Import translations. DO NOT MERGE" into nyc-dev am: 7fa7ad595f  -s ours
am: e12e17fcdb  -s ours

* commit 'e12e17fcdb3dd128ca724206086fc57bc3728ba7':

Change-Id: Ia86a97cac45ddda8ace3c141524bcb5844ae12c7