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

am skip reason: subject contains skip directive

Change-Id: I4ad2272fc83843718e4d7494eb74ff86dcc9cf78