Merge "Import translations. DO NOT MERGE" into nyc-dev am: 52edfafb9c  -s ours
am: d5d030af8b  -s ours

* commit 'd5d030af8b171adf7a91b14727c4c710da5908dd':

Change-Id: Iee7e393bfa099c6a009c1e5c0178432891c2e752