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

Change-Id: Ief80cc50b3ccd1879d8dfd8844a8c9ec2d3c5f31