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