Merge "Import translations. DO NOT MERGE" into nyc-dev am: cb6e5df633 -s ours
am: 613174e144 -s ours
* commit '613174e1446ce137e8f7cd457dfcbf471703bfc3':
Import translations. DO NOT MERGE
Change-Id: Idbe89404af42ccc5c54ec7da5e66558e857bad00
This commit is contained in: