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

am skip reason: subject contains skip directive

Change-Id: I84ca3675ff979bb6c5747ed44d8ba51e7022cd0d