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