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