Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 1c25c67a6a  -s ours am: 4e2559c62a  -s ours" into nyc-mr1-dev-plus-aosp