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

am skip reason: subject contains skip directive

Change-Id: Ic5ec5c38e4b58bf97020707cc6740f9ec186e227