[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: b92325e0f7 -s ours am: d5f6ccf10d -s ours
am skip reason: subject contains skip directive

Change-Id: I5f2707b10e67418694609365a8f95636f58f421c