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