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

am skip reason: subject contains skip directive

Change-Id: I2e38cd48e19a558137a732594648b9f492e34881