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