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

Change-Id: I9b68b76c3475d72b1f0f1afc6e8249e859b98c2e