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

am skip reason: subject contains skip directive

Change-Id: Ibabb0a26a5dd3bf14682c9839fac0c9eacce23c0