Merge "Import translations. DO NOT MERGE" into nyc-dev am: e6a875576f -s ours am: 8c648f3fd5 -s ours
am: 8a4276a2ab -s ours
* commit '8a4276a2ab6f5db38c3c9b21d8f0aa3d321a8426':
Import translations. DO NOT MERGE
Change-Id: Iedf970a73e6efb991c869a5ff791fd2b4b052be0
This commit is contained in: