Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 9aed8c2fa0  -s ours am: 02befc3229  -s ours" into nyc-mr1-dev-plus-aosp