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

am skip reason: subject contains skip directive

Change-Id: I8f58215c30f22599f7c9cee1b4327f3255c07a3f