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

am skip reason: subject contains skip directive

Change-Id: I08481badf2aef44845a1491349b4873193120fba