Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 36f8170bbc  -s ours
am: 4ad5263a52  -s ours

Change-Id: I6c73a4ef1c7111e1dccc993dd0018315e49697a6