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

* commit 'aa71ee6ddb0e5c95a88e2cab7dbbcc543991d932':

Change-Id: If3fb6496209d96b31eb7da3b93fc090829fe345b