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

am skip reason: subject contains skip directive

Change-Id: Icf7b0b403e70ca11917032a3c0d7e56aaa896ec7