[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 1a224c079a -s ours am: a384ff8b7e -s ours am: d7f2bb3618 -s ours am: 33ad23565d -s ours
am skip reason: subject contains skip directive

Change-Id: I1933a00280888550129e2c79453acac29514dfa6