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

am skip reason: subject contains skip directive

Change-Id: I57d573438afe9ffd630695772a36df7dbaf780ae