Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: ae8a460985  -s ours am: 3a2ad08776  -s ours
am: 5af07eaa5f  -s ours

Change-Id: I6f1614ae2ba79dfb081437d4870c0fd67504ffdb