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

am skip reason: subject contains skip directive

Change-Id: I7df32bd8481ad2f87a7ad1ca402f4024b01b1996