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

am skip reason: subject contains skip directive

Change-Id: I219ed74992f721928fe9517a9c890b2ba3822e2c