[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 617523dcc2 -s ours

am skip reason: subject contains skip directive

Change-Id: I5c44dfa3cb9d78f287ad2bbad45d1e73ad8a9029