Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 9d41bf11df -s ours
am: 711de8ebe8 -s ours
* commit '711de8ebe818f57aafeaa3382f5ed377783fb098':
Import translations. DO NOT MERGE
Change-Id: Ibc96d487793050ffd839a39596c67631ab7dffde
This commit is contained in: