[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 522485bb1b -s ours

am skip reason: subject contains skip directive

Change-Id: I33653925a33ef615a574a37a5efc7895f66619c1