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