Merge "Import translations. DO NOT MERGE am: b4f16b10af  -s ours am: e7527d1334  -s ours" into oc-mr1-dev-plus-aosp