Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 779722d -s ours
* commit '779722d7ed84aa0d7a03a3aec93690de9c3dcb7c':
Import translations. DO NOT MERGE
Change-Id: I39eea7741f07a090ee8aa03919c5456b68a01b5f
This commit is contained in: