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

am skip reason: subject contains skip directive

Change-Id: I8e853bf225a45f803f9d6467bb2c8460f3c7961e