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

am skip reason: subject contains skip directive

Change-Id: I478a1e70f2a333fe9ef151b19930ac2d6f64f3e6