Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 5e6fb1699f  -s ours am: dcc4542c05  -s ours
am: 2d2d335631  -s ours

Change-Id: Ib945badfb9d5fc0f218b000279df981ff3b6790b