Merge "Import translations. DO NOT MERGE" into nyc-dev am: 451dc7e  -s ours
am: c13993a  -s ours

* commit 'c13993adb0b62cbf798c4cd752e31f15c5803d8b':

Change-Id: I856f3ccb99d3764734abae88e0b94aff42ebc74d