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