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

Change-Id: I5af01f895553bfbf3eeb6de15d3a53e42c33f351