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

Change-Id: Ia7768751a2a5302b2d1df3e03735ab0b53ddf9a5