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

am skip reason: subject contains skip directive

Change-Id: Id9ea1093c9eda777402e7f37b65f6755abf76d29