Merge "Import translations. DO NOT MERGE" into nyc-dev
am: a007e877f2 -s ours
* commit 'a007e877f2ed32bd51d6c03e94e20eac94ef4081':
Import translations. DO NOT MERGE
Change-Id: I261c5b972c2cf481fcfd2cd69ae7b4803ca8fac1
This commit is contained in: