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

am skip reason: subject contains skip directive

Change-Id: Ie3cd34b54d2763641c727a193766359e77cd1020