Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: c0febc48e8  -s ours
am: 527e5a4a5e  -s ours

Change-Id: Ie5b9d854236bdabce810d3407d9e1604fd3eef25