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

Change-Id: I44f116828ee22961d9015ce824a8fccedd2df3c1