[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: b92325e0f7 -s ours
am skip reason: subject contains skip directive

Change-Id: I99c04a7c4037321bd012ce717e21fe1a436f5aeb