[automerger skipped] [DO NOT MERGE]Default disable unknown_tag_polling_delay am: 2741d3a2ab -s ours

am skip reason: subject contains skip directive

Change-Id: I692dcc76d3852562745f9d479b20459a6977c09c