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

am skip reason: subject contains skip directive

Change-Id: I8f3b52042a9e8308839fecfede9e23a65607ef97