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

Change-Id: I1c90ce51ef53efa51d3ae01fe5ee9afda99200a4