Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 576a32da20 -s ours
* commit '576a32da207ec435aa466985c827bc56709db5eb':
Import translations. DO NOT MERGE
Change-Id: Ia94fd9edaeef8625d85988d42cd56547a0bbdcd0
This commit is contained in: