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

am skip reason: subject contains skip directive

Change-Id: Ifcad92d9d48dcb751ac8ba02c087aa7cd2bdb72c