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

Change-Id: I395316ebe79ee829b3538c7167be18a517f782c8