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

Change-Id: I06a438a8cf7de8effc3d62912c1bf8761ad08d59