Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: f381889844  -s ours
am: d8ae5393a8  -s ours

Change-Id: I81703238ee45d425d9962e9bcce76f135b6b6770