[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 1a224c079a -s ours
am skip reason: subject contains skip directive

Change-Id: I12e7899010f974d10c7839eacd3b2b7876f83461