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