Merge "Import translations. DO NOT MERGE" into nyc-dev am: 576a32da20 -s ours
am: e71736cd68 -s ours
* commit 'e71736cd684e22fb0a449e800922b83c33072e5c':
Change-Id: Icdb6c51813f6c9fe5f0e406956dbbc0b5bfe93da
This commit is contained in: