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