Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: d48502972a  -s ours am: 250e262f6e  -s ours" into nyc-mr1-dev-plus-aosp