Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: e01fca71d4  -s ours
am: fee3d0532e  -s ours

* commit 'fee3d0532ec4c5b938b5c55094126963d75b6c39':
  Import translations. DO NOT MERGE

Change-Id: Ie51d060b4d3abb12ec9b7aa049d8b91ebf6384e0