Merge "Import translations. DO NOT MERGE" into nyc-dev am: e71cdef7e3 -s ours am: fc22bd87ff -s ours
am: f82c5112d4 -s ours
* commit 'f82c5112d456318dd7cb6fbb814a84272c0fc1ad':
Change-Id: I29a6a5982af379c4818308f7136790a3963fa92f
This commit is contained in: