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

Change-Id: I37902d48b996cf0ee0f6989f6ea361555102c2e7