Merge "Import translations. DO NOT MERGE" into nyc-dev am: 83a23d290d -s ours
am: 78d848342a -s ours
* commit '78d848342abf9125b2e4361afe591414850642c8':
Import translations. DO NOT MERGE
Change-Id: I6d9fdcfd17f37d33e92d2a4a3665b092d914945c
This commit is contained in: