Merge "Import translations. DO NOT MERGE" into nyc-dr1-dev
am: 994ec6a0ec  -s ours

Change-Id: Ida7cf9408ad94d3a17fc7b1154f0644c1ae33442