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

Change-Id: I807ae6a4f2808825e8363104e8e8661d5de77a2b