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