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

am skip reason: subject contains skip directive

Change-Id: I43b7ffabb1c7c24e2b91d4a035f241e7582c4628