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

Change-Id: I27367eddd1abbe0e8416f54808f128652d622fb0