Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 52edfafb9c -s ours
* commit '52edfafb9c53d14a5e1de1ecdd3d5b735cecf711':
Import translations. DO NOT MERGE
Change-Id: I4ef01eea310877c5201b9c2e44c9f49948aeb1f1
This commit is contained in: