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