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

am skip reason: subject contains skip directive

Change-Id: Ib1c6f5bfb858282b4e0392b7d42c0e311409b652