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