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