Merge "Import translations. DO NOT MERGE" into nyc-dev am: e71cdef7e3 -s ours
am: f35dcdb530 -s ours
* commit 'f35dcdb530d4e490770faf588c63dcff3f879b45':
Import translations. DO NOT MERGE
Change-Id: Ifa2c8f7ff76137c9cafd4cedeb2b684f2be22ebe
This commit is contained in: