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