[automerger skipped] Import translations. DO NOT MERGE
am: ac82b0cdc0 -s ours
am skip reason: subject contains skip directive

Change-Id: I0a4963a284c5f5ccdfdb36881ace15f6dff21988