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

am skip reason: subject contains skip directive

Change-Id: I4664c0ebbb14a5678f515240adde7755f5c4f26e