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

am skip reason: subject contains skip directive

Change-Id: I61c7ed4f04f25dc112548f1fd84a1519317fa939