Merge "Import translations. DO NOT MERGE" into nyc-dev am: 24708d9c8e -s ours am: 5165a87256 -s ours
am: 1efc6c9fb2 -s ours
* commit '1efc6c9fb212bfd578c7842b136bfc5924e10254':
Import translations. DO NOT MERGE
Change-Id: I260a997c5b3e30a9f43341db54791856a0912b4b
This commit is contained in: