Merge "Import translations. DO NOT MERGE" into nyc-dev am: 93f97c07f6  -s ours
am: 5f0e629a64  -s ours

* commit '5f0e629a64ea2c18f4ca6b2cf3b7dea9496c93bc':

Change-Id: Ie06087ea99fb977f5dc0a828a9f5aca0d777a17d