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

Change-Id: Ie1c3ad4652f6ba84cc2b4dcfdf7bac326f1e034d