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

am skip reason: subject contains skip directive

Change-Id: If97c9876d8d2773316eb92aff6baf517859602dd