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

Change-Id: I9035c31bada7ae86c4670b8f4c0d17ed4ec61a3e