Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 47a7899 -s ours
* commit '47a78999ea8719359bf704db3bbe96db214d51fd':
Import translations. DO NOT MERGE
Change-Id: Ica60c273aaf6466250078ee0051278060a0aa650
This commit is contained in: