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

am skip reason: subject contains skip directive

Change-Id: I7b31f6202659d2561406d41191f011243ab45111