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

Change-Id: I0b233185314d692b9345b784c708b146365c7c2c