[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 95362df0b0 -s ours am: 184ef52b88 -s ours

am skip reason: subject contains skip directive

Change-Id: Ia07b01db1653b9dcbfbb2bdf466aba5e708bb055